From 560e563b3d6b5a1917b15205d948e5ea6f98b403 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Sun, 26 Apr 2026 16:18:32 +0200
Subject: [PATCH] system-crates

Gbp-Pq: Name system-crates.diff
---
 Makefile.fetch        |   4 +++-
 RepositoryExternal.mk |  11 +++++++++++
 config_host.mk.in     |   1 +
 configure.ac          | Bin 598048 -> 598714 bytes
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Makefile.fetch b/Makefile.fetch
index 64c15b67b64..e88ec4928ff 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -256,8 +256,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
 		$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
 	,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item)))
 	-@mkdir -p $(TARFILE_LOCATION)/cargo
+	$(if $(filter TRUE,$(SYSTEM_YRS)), \
 	$(if $(call fetch_Optional,YRS,1),\
-		CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml)
+		CARGO_HOME=$(TARFILE_LOCATION)/cargo cargo fetch $(if $(verbose),--verbose,) --locked --manifest-path $(SRCDIR)/external/y-crdt/Cargo.toml) \
+	)
 	@mkdir -p $(dir $@) && touch $@
 	@mkdir -p $(dir $@)/Executable
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 17543065dcb..8b5863ebf9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4547,6 +4547,7 @@ endif
 
 ifneq ($(WITH_YRS),)
 
+ifeq ($(SYSTEM_YRS),)
 define gb_LinkTarget__use_yrs
 $(call gb_LinkTarget_use_external_project,$(1),y-crdt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4569,6 +4570,16 @@ endef
 
 else
 
+define gb_LinkTarget__use_yrs
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(SRC_ROOT)/debian/cargo_registry/yffi/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/libyrs.a)
+endef
+endif
+
+else
+
 gb_LinkTarget__use_yrs :=
 
 endif
diff --git a/config_host.mk.in b/config_host.mk.in
index 22bca59f7d9..b15034f5779 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -748,6 +748,7 @@ SYSTEM_WPD=@SYSTEM_WPD@
 SYSTEM_WPG=@SYSTEM_WPG@
 SYSTEM_WPS=@SYSTEM_WPS@
 SYSTEM_XMLSEC=@SYSTEM_XMLSEC@
+SYSTEM_YRS=@SYSTEM_YRS@
 SYSTEM_ZLIB=@SYSTEM_ZLIB@
 SYSTEM_ZSTD=@SYSTEM_ZSTD@
 SYSTEM_ZMF=@SYSTEM_ZMF@
diff --git a/configure.ac b/configure.ac
index 740332ae4b6d4cc6d33f0ffa0109fa5f9a9f6ba0..7f1baa696be1627bd0e5def1d121b76775ced26d 100644
GIT binary patch
delta 405
zcmXYr!Ab&A6oxsI<H(d$V1_|-E2Dy}cCCc8T()r>Lc*r2Ty<)4V&<yMA~IaGj=-}D
zViwT@1VJlXNYFd9s3+-;(}9ok-*dSC`JaaA_ffj{3X4AOrX+Q6Cd)`ZB}MWaoJ}Zm
zINVUCW96cjEfw_w-shwR{7y#WgI_t0dp^YRA}&upe2rAJpQ8%uJ}lql4h&7tYo!gX
ztd$B!hWNgzs;i_%EsL0(c#cb0hqVZA+U-VDG)8I;<&2mvskTjv2g0k@&25rziw9qK
zNzG!^VUDojP0C4^dZ7@0Rc6_(hD*3Twwj?;yTeE((=~ZBBaR^$kN^*FKVS*>&p`<i
zRJK&|UnjcDg3(TJa-0N*r;xzP6(r}yJiC$(tPIz4IlDB*QSrxslvHz&YCy1e43VjD
noe9^J!l4|>7YceP2US?R>-!*(1QUXYKo&#=%3I%$JzoC-EYFEG

delta 69
zcmdmWRAs>dm4+>hvWuo0FtYJZpY?>5mpL*hc=|#qcIoN+7BMQe3oK;>VkRJF24WT<
RW(8t4AZFh#u#{s}EdXZL7zY3V

-- 
2.30.2